fix Qt6 deprecation warning in mapbar_track. (#703)

* fix Qt6 deprecation warning in mapbar_track.

"warning: 'fromUtf16' is deprecated: Use char16_t* overload."
However, it is recommended to use QString(const QChar *, int) or
QString(const QChar *) instead of
QString::fromUtf16(const ushort *unicode, int size = -1) and
QString::fromUtf16(const char16_t *str, int size = -1) anyway.

* fix Either the condition 'track==nullptr' is redundant or there is possible null pointer dereference.

as this isn't using a non-throwing allocation function memory allocation
errors will cause std::bad_alloc to be thrown anyway, we won't return
with track == nullptr.

* eliminate another non-functional memory check.

diff --git a/f90g_track.cc b/f90g_track.cc
index 1ea72c7a40fc635b96484ca4cf65f3a848c856d0..a949f471354465018e4360d04db7614a9d92d41b 100644 (file)
--- a/f90g_track.cc
+++ b/f90g_track.cc
@@ -69,7 +69,6 @@ f90g_track_rd_init(const QString& fname)
     }
     // start the track list
     track = new route_head;
-    is_fatal((track == nullptr), MYNAME ": memory non-enough");
     track->rte_name = QFileInfo(fname).fileName();
     track_add_head(track);
   }

diff --git a/mapbar_track.cc b/mapbar_track.cc
index 25c64aa659e6eb82a3500dbb3cb600e758083838..3efc4fd88bd5f5b1bb33270a4181382c99d67ad1 100644 (file)
--- a/mapbar_track.cc
+++ b/mapbar_track.cc
@@ -21,8 +21,18 @@
 
  */
 
+#include <cstdio>               // for SEEK_CUR
+
+#include <QtCore/QChar>         // for QChar
+#include <QtCore/QDate>         // for QDate
+#include <QtCore/QString>       // for QString
+#include <QtCore/QTime>         // for QTime
+#include <QtCore/QVector>       // for QVector
+
 #include "defs.h"
-#include <QtCore/QDebug>
+#include "gbfile.h"             // for gbfgetint16, gbfgetint32, gbfseek, gbfclose, gbfopen, gbfile
+#include "src/core/datetime.h"  // for DateTime
+
 
 #define MYNAME "mapbar_track"
 
@@ -58,7 +68,6 @@ read_datetime()
   int mon = gbfgetint16(fin);
   int mday = gbfgetint16(fin);
   gpsbabel::DateTime t(QDate(year, mon, mday), QTime(hour, min, sec));
-// qDebug() << t;
   return t;
 }
 
@@ -81,22 +90,21 @@ static void
 mapbar_track_read()
 {
   auto* track = new route_head;
-  is_fatal((track == nullptr), MYNAME ": memory non-enough");
   track_add_head(track);
 
   (void) read_datetime(); // start_time currently unused
   (void) read_datetime(); // end_time currently unused
 
-  ushort name[101];
+  QChar name[101];
   // read 100 UCS-2 characters that are each stored little endian.
   // note gbfread wouldn't get this right on big endian machines.
   for (int idx=0; idx<100; idx++) {
     name[idx] = gbfgetint16(fin);
   }
-  name[100] = 0;
+  name[100] = u'\0';
   // At this point, name is a UCS-2 encoded, zero terminated string.
   // All our internals use Qt encoding, so convert now.
-  track->rte_name = QString::fromUtf16(name);
+  track->rte_name = QString(name);
 
   // skip two pair waypoint
   gbfseek(fin, 8*4, SEEK_CUR);
@@ -106,11 +114,7 @@ mapbar_track_read()
   gbfseek(fin, 4, SEEK_CUR);
 
   int end_flag = gbfgetint32(fin);
-  for (;;) {
-    if (end_flag) {
-      break;
-    }
-
+  while (!end_flag) {
     int length = gbfgetint32(fin);
     is_fatal((length < 1) || (length > 1600), MYNAME ": get bad buffer length");